You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Radiant Faith was not calculating armour and energy shield correctly when using a Foulbourn Choir of the Storm, as resistances were not calculated before mana and GrantReservedManaAsAura are calculated. I've refactored the resistance calcs into a separate function delayed the aura calculation to the latest possible instance and call the resistance to be calculated before recalculating the mana and reserved mana, when the mana is increased by x% of overcapped lightning resistance mod exists. Also reverts 06f7a74 as it's no longer required
Steps taken to verify a working solution:
Import PoB (linked below)
Compare the numbers to the With Choir of the Storm screenshots
Swap Amulet to Eyes of the Greatwolf
Compare the numbers to the With Greatwolf screenshots
Fair enough, I'll close this PR as I was trying to do minimal changes/not change code flow but didn't realize it killed the aura portion. Where are you viewing the 2 ES auras? On my end its overwritten in the output.
Calculating extra auras later makes the most sense to me but is obviously prone to more issues, so it's probably something the core maintainers will have to reevaluate.
I'm using a modified copy of ModDBClass:Print() that prints the things I'm interested in (so I'm not looking at a massive wall of text) and call it during doActorLifeManaReservation so I can see how things change and open the console using ctrl + ` (backtick) to see the results.
I figured out why I end up with two ES ExtraAuras.
Add Armour mod because no matching mod exists
Replace Armour mod with ES because matching algo doesn't check the nested mod and then flags the mod as replaced
Add Armour mod because previous mod is marked as replaced so previous ES mod is ignored
Replace Armour mod with ES again and flag as replaced
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #9358
Description of the problem being solved:
Radiant Faith was not calculating armour and energy shield correctly when using a Foulbourn Choir of the Storm, as resistances were not calculated before mana and
GrantReservedManaAsAuraare calculated. I've refactored the resistance calcs into a separate function delayed the aura calculation to the latest possible instance and call the resistance to be calculated before recalculating the mana and reserved mana, when themana is increased by x% of overcapped lightning resistancemod exists. Also reverts 06f7a74 as it's no longer requiredSteps taken to verify a working solution:
With Choir of the StormscreenshotsWith GreatwolfscreenshotsLink to a build that showcases this PR:
https://pobb.in/jQdfX_LgQW2w


With Choir of the Storm
With Greatwolf


Also tested using the PoB provided in #9350 (comment) (The number I get is off by 19 so may need another PoB to verify, but way closer than before)
Before screenshot:
With Choir of the Storm
With Greatwolf
After screenshot:
With Choir of the Storm
With Greatwolf
Other PoB:
Before screenshot:
After screenshot: